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

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

Change-Id: I43fa9542259988e63872323cf19f23cfee510102