Merge "Created empty framework-location non-updatable module" into main am: 22f11911

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



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