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

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

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



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