Merge "Add riscv64 support for installd testcase" am: 96fbd13bde am: 92936331a7 am: c1027d9f9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2252355

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