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

* dev/10/fp2/security-aosp-qt-release:
  prevent overlays on the phone settings

Change-Id: I81ac025fddd6391a19a3ad603893ec1c7799552e