Merge "Created empty framework-location non-updatable module" into main am: b0a5dffa7c am: 6dce5ad959

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

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