Merge "Merge "cec: resolve HdmiCecTvPowerToggleTest issue [1/1]" am:...

Merge "Merge "cec: resolve HdmiCecTvPowerToggleTest issue [1/1]" am: 96c64c02" into stage-aosp-master am: d532caca am: bd635e64

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



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