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

* dev/11/fp3/security-aosp-rvc-release:
  Fix security vulnerability when register phone accounts.

Change-Id: I988aa9807535edea35386434c6d458e7583737c2