[automerger skipped] Merge "Created empty framework-location non-updatable module" into main am: b0a5dffa7c am: f3dda78604 am: b2a2d61fb7 -s ours

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

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

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