Merge "Update Android's bundled mime.types mapping." into main am: 4681b3be

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



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