Merge "Fix setActiveDevice(null)" am: cc28752cfa

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

Change-Id: Ieb7c1906481cb62eaeb40c03eb08fb398d1f7216