Merge "Add CTS for new data policy methods" am: 4e4e66c1d6 am: 7b47c3d7c2

Original change: https://android-review.googlesource.com/c/platform/cts/+/1470179

Change-Id: If5746ea38c5be3015a07c84faf0c0afda148763f