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

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

Change-Id: I06cb30773d309fed7bdbc108003d0db5e0e567b4