Merge "Revert "CEC: Remove HdmiControlManager#mLocalPhysicalAddress variable""