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

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

Change-Id: Ic87cc66e5771f25bb7f74d212f46d6d9a97efcce