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

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

Change-Id: I264464cc6aa5596cceb60e53e68955c97f3ad4cb