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

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

Change-Id: Ie1742310eb961ca84358c655133b3b50e39f8177