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: d41b70e4
Change-Id: I0e9eee291c86e54d42006ec1b1279f8f75b8c7a2