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

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

Change-Id: I1c7478f9581a8092b74e1505ad6dec15d22c9ae3