[automerger skipped] Fix OOB read for registerLocaleList am: d8a427cc9c am: 4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours am: aa6c2c7aaa -s ours

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

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

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