[automerger skipped] Atest: move active targets to atest/Android.bp am: 85d015ff42 am: 089430f0b8 -s ours am: 455592248f -s ours am: 29feeb98f9 -s ours

am skip reason: Merged-In Ibffc4060e2c3c5259cda6d0145b5c74471febdaa with SHA-1 85d015ff42 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/asuite/+/16168284

Change-Id: Ie48a452a11d83404e0cc232b7ccf94c03eef3a64