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

am skip reason: skipped by user jimtang

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

Change-Id: Ie1cea9b9889477a77b3dc672c2ec8900a0f41840