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

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

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