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

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

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