Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc am: 4e254916f0

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

Change-Id: Ida4ad72ab7b1e3d7cc34342b5bf78b91b7b5d1c3