Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2

* dev/10/fp2/security-aosp-qt-release:
  Fix OOB crash for registerLocaleList
  Fix OOB read for registerLocaleList

Change-Id: I85b4243503a60e043ef0294671557ee36a0d9d24