Merge "Add TestApexes to ApexInfo" am: a4c93e3b am: 11b5bf51

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



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