Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  prevent overlays on the phone settings

Change-Id: If1e04c9f9529d2b6a6cba89ae706602903bb4bfc