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

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

Change-Id: I4dd5dfa39c61c04b995238f4f4dc4837871d0e58