tree 2c4f9a6b4ff7a6603e5e1bd1ffd2f0ad2f1d7bc7
parent 347557e9050d86e5c68f11a3e468ae3e50ef1bdb
parent 4895ad6bd922ebd4979f2df7fe483842d8ff9529
author Treehugger Robot <treehugger-gerrit@google.com> 1632852963 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632852963 +0000

[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours am: 5f35a1d2d3 -s ours am: daf25cf47c -s ours am: 4895ad6bd9 -s ours

am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history

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

Change-Id: I9acaa94297b0ef31f5c2c78d36c926ab005f10e8