[automerger skipped] Merge "DO NOT MERGE: HA still appears in Media device...

[automerger skipped] Merge "DO NOT MERGE: HA still appears in Media device list even though it has been unpaired." into sc-v2-dev am: 9c053702 -s ours

am skip reason: Merged-In I4ed5db2bd01f4b4e8f246ed3e8f74e24149571f9 with SHA-1 78b25059 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16000209

Change-Id: I2086dbac6a78d8a8629a7f27017ae195643467e6