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

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

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