Merge "Merge "HDMI: Fix ARC enabling when there is no eARC local device" into...

Merge "Merge "HDMI: Fix ARC enabling when there is no eARC local device" into udc-dev am: bc66c7d0" into udc-mainline-prod am: d5e45614

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



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