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

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



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