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

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

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



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