[automerger skipped] Merge "Fix CEC init twice in normal boot" am: 1d1c6ae7...

[automerger skipped] Merge "Fix CEC init twice in normal boot" am: 1d1c6ae7 am: 158f098e am: 0831b52c -s ours

am skip reason: Change-Id I50a1423ef223156f98c6f21e9be82130a284295a with SHA-1 3ecb6747 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id821209bf6812333a160bee08d58e2445cd87627