Merge "Add CtsShimAddApkToApex app" into main am: c947eb92e6 am: f7fa7a342a

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

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