Merge "hidl2aidl: conversion of gatekeeper hidl to aidl" am: f35d1a76 am:...

Merge "hidl2aidl: conversion of gatekeeper hidl to aidl" am: f35d1a76 am: 9ab2be37 am: 80cb3880

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2161817



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