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

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

Change-Id: I8523138dee51b75e3547a96c1e2e96397cc222b8