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

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

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