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

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



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