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

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

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