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

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

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