Merge changes I67d9a186,I12e1a8e0 into udc-dev am: 03001d6c am: b36b95e6

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



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