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

* dev/10/fp2/security-aosp-qt-release:
  Removes unnecessary permission from the EmergencyInfo app.

Change-Id: I17ae454629e3fa1445d5bdb63f83e7c6f1219e40