DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4bc0 am: 0770cd25c2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424d9adecad265dda86e581f2fc86990fb97b2fb