Merge "Fix setActiveDevice(null)" am: cc28752cfa am: 80ecfa9781 am: e4dce25a22 am: 18285999b0

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1878416

Change-Id: I69d272031fc08bb363047899cb4ce8c2b8519a50