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

* security-aosp-qt-release:
  [RESTRICT AUTOMERGE] C2AllocatorIon:protect mMappings using mutex

Change-Id: I4212c0b3804c9611a5d4c8335f6af47323a5c014