[automerger skipped] DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4bc0 am: 0770cd25c2 am: 79f19d0314 -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: Id2aff475fe302d2f7b974156f26343b9258ffaf5
This commit is contained in: