Merge changes from topic "hidl2aidl_gatekeeper" am: 95b037139e am: 1fc4c0349a

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

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