Merge "Add riscv64 CtsShim APKs to the build rules" am: c3eb73ba12 am: 5fedff9941 am: 5ef860e257 am: 6be0fd3502 am: 11e96a68f9

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

Change-Id: I22e7c18ec9132f0fe2f86fc5920acf50d60de7ea
Signed-off-by: Automerger Merge Worker <[email protected]>