Merge "Revert "CEC: Remove HdmiControlManager#mLocalPhysicalAddress variable"" am: e2b22598 am: 2ccae07b am: 88a3af1f

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



Change-Id: Id38dc22865fdf331ccf9393bbbfc11c9c59317c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>