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