Merge "rewrite android_app to android_test in mk2bp" am: 36a0e33b am: 212a825a am: 1dd1a81c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056410



Change-Id: Ic1665ae8894219486f5323f3a284ffbb76689035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>