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 am: b8d2f1cd" into udc-d1-dev-plus-aosp am: 9535089d

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



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