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

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

Change-Id: I2665b146d698e27a7ad99ec24481f11e3448c6d2