[automerger skipped] Merge "Remove poc dependency on AndroidTest.java" into oc-mr1-dev am: 913614b10c -s ours am: 59b20222df -s ours

am skip reason: Change-Id If2107a21dbc2dd112dfc1b760dfe5c13f98dee59 with SHA-1 a38ce49353 is in history

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

Change-Id: I50272a6fdbc24c8c53a22aa5269daac47bb90202