Merge "cec: TV could fail to handle one touch play [1/1]" into main am: d88b39e9ea am: 10d388e9bc

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

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