[automerger skipped] Merge "Use removeActiveDevice() when set phone as active...

[automerger skipped] Merge "Use removeActiveDevice() when set phone as active device" am: d63d2456 am: 710aa1f5 -s ours am: 2a41d41e -s ours am: 16f318ea -s ours am: fc91ae29 -s ours
am skip reason: Change-Id Icfe6a50ba3fc807daf3445cfdd852787dc26e3c1 with SHA-1 531382fe is in history

Change-Id: If5cbfe97d6e510f90c1548759e634c3e386c8a3f