Merge changes from topic "hidl2aidl_gatekeeper" am: 95b03713

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



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