Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master am: 5d7bfac82a am: 80df3099d1 am: 75b045da0d

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

Change-Id: I413e2e7640424e5c12b078d1d946ce339e809acd