Merge "Reconnect CEC HAL callback" am: f1df6bf33a

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

Change-Id: I1dcb74c11b66eb9e6fb26b366bb1ccde399cc772