Merge "hidl2aidl: conversion of gatekeeper hidl to aidl" am: f35d1a765d am: 9ab2be3708

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

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