Merge "Reconnect CEC HAL callback" am: f1df6bf33a am: 70c1c7069f am: 339cefd32a am: d609fa5d99

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

Change-Id: I134bf056c09473c0accbefb04a6399799fb49667