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

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



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