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

[automerger skipped] Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c am: 7c041f77 am: 5d73b68c -s ours

am skip reason: Merged-In Iebc6d016b8313759ac1f6f3ab6f4834f5ad7b93e with SHA-1 8bf29fd4 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727716



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