Merge "Add CtsShimAddApkToApex app" into main am: c947eb92e6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2715533

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