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

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



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