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

Merge changes I67d9a186,I12e1a8e0 into udc-dev am: 03001d6c am: c58a573b am: f714035f am: 7268f613

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



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