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 am: 93f1f6e3 am: b093ac07 am: 2adb667d

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



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