Support for multiple versions of DeviceInfo am: 4663fb4035

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

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