tree 6a706e17eed9fae1f3f0b75b14c7faeea81878af
parent 402b3e282c95cf26b1688157ef0f84b0a2e8bd9f
parent d5c896094a8c87a9ce2656dda1f56baaca2c92b8
author Seth Moore <sethmo@google.com> 1646061894 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646061894 +0000

Merge changes from topic "deviceinfo-update" am: 975150fcf5 am: d5c896094a

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1984097

Change-Id: I15c5439626ef03d7d997c455c8cd44ba03f9bb0d