Merge "HDMI: Do not start NewDeviceAction while DeviceDiscoveryAction is running" into main am: af64d587fc

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

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