[automerger skipped] Merge "DO NOT MERGE Fix CEC read Global Setting timing" am: 7e69b0a93d am: c0c9dbfc2f am: bdef0ad3bc -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: I39e00944462e47dfa36482737ffefbd4d930942e
This commit is contained in: