Merge "Gralloc: AIDL HAL may replace HIDL HAL." into tm-dev am: 2eab518ff5 am: 5ff3b98dc2 am: 2f65d1ed47 am: 52baa5fb6d

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

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