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

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

Change-Id: I745bb22f39087d70a2414706cd41c5548c70bae4