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

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

Change-Id: I24991fa882dd814fd5061be57bb7e5c6fadb8753