Merge "composer: AIDL HAL may replace HIDL HAL." am: 6f691f1810

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

Change-Id: I3e54c5d98ffb66fe8b29c0a75b667384fda98211