[automerger skipped] Merge changes from topic "telephonymanager-data-policy"...

[automerger skipped] Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bd am: 4e254916 am: dacbfa7e am: 2f70f9a7 -s ours

am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 9d30001a is in history

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

Change-Id: Iaaa83a28a354247279d26713db32746dadc02cee