Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Resolve account image icon profile boundary exploit.

Change-Id: I979764ae89582d4ef8fd178241e1b0e7d84965c7