Merge "Use removeActiveDevice() when set phone as active device" into rvc-dev am: 30ac1ffeb3

Change-Id: I62b14d6fd988aa0e26154c249fa3cf9fb7c3193e