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

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

Change-Id: I167e33c5661d219e44afdb086e09621b77967ef3