[automerger skipped] Fix OOB crash for registerLocaleList am: a826540766 am: 215b93c38f am: f5624d3ae3 am: d3a71cd81a am: 13bd99317e am: 7396994db3 am: 3ef2e45a28 -s ours am: 99e70d3890 -s ours am: 17d8b69fb6 -s ours

am skip reason: Merged-In I651d1ff64d06b4c30e18ee69772f52a60aa5ff7a with SHA-1 a826540766 is already in history

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

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