Support for multiple versions of DeviceInfo am: 4663fb4035 am: 6b71a5652c

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

Change-Id: I5a6cf79690190aa8d1fb8fb6113331c0094ec200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>