[automerger skipped] DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4bc0 am: 0770cd25c2 am: 79f19d0314 -s ours am: a9e4ebec10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib28bdf3a402e2915814d7352a5b5ea47662085e1
This commit is contained in: