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

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

Change-Id: Idbcc5334938d210abfa3cce5c8bb5af6fbff28f3