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

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

Change-Id: Id832db960950f31ac799af60478aff373873d070