Merge "Revert "CEC: Remove HdmiControlManager#mLocalPhysicalAddress variable"" am: e2b2259804 am: 2ccae07bdc

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

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