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

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

Change-Id: I7a4c450682083389c760144fb62e1ea83f61755d