Merge "resolve merge conflicts of f25eb7ad to...

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

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



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