Merge changes from topic "telephony-owners" into sc-dev am: f173d238 am: df363631 am: 085e1b57

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15445866

Change-Id: I6261bd7d51ca986d29e547b4ee4a8a5f1467244f