Merge "Modified to check the Modem version for getImei" into udc-dev am: 1f8e0a19

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



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