Merge "Refactor HDMI related AIDL packages" am: e6c4ebb0de am: 8047dfe2ed

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2347525

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