[automerger skipped] Merge "Created empty framework-location non-updatable module" into udc-mainline-prod am: 5d37d133c4 -s ours

am skip reason: Merged-In Id077cff3825cea0da2ea9fad06c53eeb4f8655a2 with SHA-1 9ee1866f3e is already in history

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

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