Merge changes from topic "hidl2aidl_gatekeeper" am: 95b03713 am: 1fc4c034 am: b8329de6

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



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