[automerger skipped] Merge changes from topic "telephonymanager-data-policy" am: 11d63a2dfb am: c1e3f54709 am: 5d3fd12e1b am: fa5bf7e7ee -s ours

am skip reason: Change-Id I8e948878e8ee107a0095312613466ceb1717508c with SHA-1 746e03cc48 is in history

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

Change-Id: I2cdc052580c27dcdfc49a962d9bc3bf0ef061113