[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-plus-aosp am: ae86b08b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I405fa2d795b796be7178539911bc8a9b6a750fac