Merge changes from topic "hidl2aidl_gatekeeper" am: 95b037139e am: 1fc4c0349a am: b8329de61c am: fcd6f6e1a3 am: 73719acdf3 am: 660c659c5d

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

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