[automerger skipped] Merge "DO NOT MERGE Fix CEC read Global Setting timing"...

[automerger skipped] Merge "DO NOT MERGE Fix CEC read Global Setting timing" am: 7e69b0a9 am: c0c9dbfc am: bdef0ad3 -s ours am: 1adabc43 am: c7d61c32 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia13d6d391c4dba89242ca5c35fbb0379872213f4