Merge "Push pocs in the test instead of AndroidTest.xml" into pi-dev am: f3408e93a3 am: 1b7d599bcd am: 1199d16dc2 am: fdd759ef01

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

Change-Id: I5d6932324125cbf1f87e8834353bfd280d018fab