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