[automerger skipped] Merge "[res] Move the latin parents map to be first" into main am: 25d1dfbe6c -s ours am: 9fe1784cbc -s ours

am skip reason: Merged-In I8aae2a3ced662aceb2965c110168c861dcabb2f0 with SHA-1 8fb681e6c4 is already in history

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

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