tree 6a706e17eed9fae1f3f0b75b14c7faeea81878af
parent 355c8480643940874bb0289d3b5a79e73f30038c
parent 975150fcf571be2f5f3147c49fa1744ffd716464
author Seth Moore <sethmo@google.com> 1646060534 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646060534 +0000

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

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

Change-Id: I2665b146d698e27a7ad99ec24481f11e3448c6d2