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

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

Change-Id: Ib9a47b6400f79d50f5875d2614a487e88dd2202f