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

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

Change-Id: Ib50c3218bf4cce6f4b63989c69e542f09440d7ca