Merge "The aidl changes necessary to add requested AHB format enums" am: 3e01679bb5 am: a8fbf496f8 am: af57555cbf

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

Change-Id: I6ef9729b24defe2acad14c332455d8542a325eb5
Signed-off-by: Automerger Merge Worker <[email protected]>