tree 7c90d97e74b5c080d6ee4ff33d484a22cdbca327
parent ef1511a929066b471fab2ba6c43ecc1457737e70
parent bbde18214dab1ced9a1658b5802c7f997f764d92
author Steven Moreland <smoreland@google.com> 1630430752 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630430752 +0000

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