Merge "Fix missing invocation of HdmiControlStatusListener" into sc-dev am: 7182e9a3 am: 75f487bb

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

Change-Id: If55d47e3785cd7b15440e2a46f30a545b402b66a