Merge "Fix CEC init twice in normal boot" am: 1d1c6ae770

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30b5741fea5441bcae5975c7fa52ac97ca43b313