[automerger skipped] Merge "Remove poc dependency on AndroidTest.java" into oc-dev am: a3091be103 am: 0fe45e8709 -s ours

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

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

Change-Id: I69938ae89272098c4e07d1e437e73846fb99411f