[automerger skipped] Add new methods for setting mobile data policy am: 83bb093cc5 am: f784eebb36 am: 44eed5a8d9 am: c93850ce72 -s ours

am skip reason: Change-Id I6033a84f0a0163e460343ebf603d66078455fe38 with SHA-1 df5ebc6eb9 is in history

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

Change-Id: I2d4a37dfa67eef480db0bfa6954cb25d25c2778e