[automerger skipped] Created empty framework-location non-updatable module am: 031684a9 -s ours

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

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



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