[automerger skipped] Merge "HDMI: Do not start NewDeviceAction while...

[automerger skipped] Merge "HDMI: Do not start NewDeviceAction while DeviceDiscoveryAction is running" into main am: af64d587 am: a2cfc73a -s ours

am skip reason: Merged-In I1da6e45f852f3e8bab0b51003e7929a6904f80b9 with SHA-1 f25748e4 is already in history

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



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