[automerger skipped] Merge "Modified to check the Modem version for getImei"...

[automerger skipped] Merge "Modified to check the Modem version for getImei" into udc-dev am: 1f8e0a19 am: 0fd5d139 -s ours

am skip reason: Merged-In Ie9c7265b8bec0c5bf0eed3d14607aa4a6416ff39 with SHA-1 df0a2d91 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22434783



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