Merge "resolve merge conflicts of f25eb7ad to...

Merge "resolve merge conflicts of f25eb7ad to udc-dev" into udc-dev am: 35a425d3

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



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