Add 2nd IMEI to keymaster request am: c2c3ed2129 am: f6ea0dd21e

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

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