Merge "DO NOT MERGE Fix CEC read Global Setting timing" am: 7e69b0a93d am: c0c9dbfc2f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3fad210d8cfa0ad6619d0216fd3f8af17184495