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

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



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