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: I6648c4d9fcd9ca366c6ddb78707a7f9cdf68ef7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>