[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: 540cc26c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I67bfe2b0eee38462dbd3476dd612adcbc83753f8