Merge "Reconnect CEC HAL callback" am: f1df6bf33a am: 70c1c7069f

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

Change-Id: I62b4af1673c460375d4929991146218beeadc0e4