[automerger skipped] DO NOT MERGE Fix CEC read Global Setting timing am:...

[automerger skipped] DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4b am: 0770cd25 am: 79f19d03 -s ours am: a9e4ebec am: 03eaa72b -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: I0bff3d93ab704bbc2b139e0832b79134e61b8b68