Merge "Gralloc: AIDL HAL may replace HIDL HAL." into tm-dev am: 2eab518ff5 am: 3905f256e7 am: a97d886ea6

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

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