[automerger skipped] [automerge] Fix OOB read for registerLocaleList 2p: fde7f4a25c am: 1af0bef572 -s ours am: a5ce29f6e9 -s ours

am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history

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

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