Merge "Use removeActiveDevice() when set phone as active device" into rvc-dev am: 30ac1ffe am: 56116c80 Change-Id: I6f14fe4693aa08a6b6ac859d91d1abe1657298a9