Merge changes I67d9a186,I12e1a8e0 into udc-dev am: 03001d6c am: 15357d2b am: 3370094b

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



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