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

* security-aosp-qt-release:
  Fix sorting issue during emergency call attempt.

Change-Id: I35f1d138531d7e0825848d18b906eb1283d7f4d5