[automerger skipped] Fix OOB read for registerLocaleList am: d5d0c70c3c -s ours am: c801109095 -s ours

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

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

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