Merge changes from topic "b188871598-security" am: 067901ea81 am: bbde18214d am: da9033bda5

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

Change-Id: Idb6dd6660bfa40c7d459d78116b8ade74a224f6c