Merge "add jarjar_prefix for framework-location" into main am: c1b5c042 am: f5cc9321

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



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