Merge changes from topic "telephonymanager-data-policy" am: 11d63a2dfb am: c1e3f54709 am: 5d3fd12e1b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1469912

Change-Id: Ibc97418a8f9351026f8451d712e0e35319fc68b8