Merge "Add riscv64 CtsShim APKs to the build rules" am: c3eb73ba12 am: 5fedff9941

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

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