Merge "Add the second IMEI tag" am: 9e34eae550 am: 308d43a303

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2295117

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