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

* dev/11/fp3/security-aosp-rvc-release:
  RESTRICT AUTOMERGE Fixed leak of cross user data in multiple settings.

Change-Id: I25459f39ec83fa1cf768fd1f3894c592ce242fc0