[automerger skipped] Revert^2 "ASuite: remove _py3_ in target names." am: d8c8a70d54 -s ours am: d5c776269a -s ours am: 42956d9f55 -s ours

am skip reason: skipped by user chiayupei

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

Change-Id: Icfbfe7031981fcd10d746d5d59499ff3fae73900