Merge "Add CtsShimAddApkToApex app" into main