[automerger skipped] Merge "Created empty framework-location non-updatable...

[automerger skipped] Merge "Created empty framework-location non-updatable module" into main am: b0a5dffa am: 6dce5ad9 am: 31228a26 -s ours

am skip reason: Merged-In I721fc4ae5c62cf1eada9bb6b4e5b3f1a4c9db21a with SHA-1 90cd63bc is already in history

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



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