Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master

* changes:
  Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc
  Add new methods for setting mobile data policy am: 83bb093cc5