[automerger skipped] Merge "Use removeActiveDevice() when set phone as active device" am: d63d2456f4 am: 710aa1f501 -s ours am: 2a41d41e91 -s ours
am skip reason: Change-Id Icfe6a50ba3fc807daf3445cfdd852787dc26e3c1 with SHA-1 531382fec3 is in history

Change-Id: Ie36ca26d06825cf63c13eaeaf0665fa00eaf7890