[automerger skipped] Merge "return void when called getImei in case of...

[automerger skipped] Merge "return void when called getImei in case of RadioModemProxy is empty." into udc-dev am: 81972c71 am: a324d195 am: 06a9f673 -s ours

am skip reason: Merged-In Ifa2b9c396bada2834808719d882b70e487995049 with SHA-1 5c73862e is already in history

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



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