Merge "Marking HIDL version of gatekeeper as optional." am: abe7b164e4 am: ff6e466bad

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

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