Merge "audiopolicy: treat HDMI as part of last connected  media device" into main am: f5aa2d46af

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2786039

Change-Id: Icb0cf8ff075d943cfde484668560bd59ae85c49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>