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

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

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