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

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

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