Push pocs in the test instead of AndroidTest.xml

This will remove test conflicts in AndroidTest.xml

Bug: 171320823
Test: run all of STS
Change-Id: I45de7af4a70685928cb0cf385b40a792b0ee793b
Merged-In: I45de7af4a70685928cb0cf385b40a792b0ee793b
3 files changed