Merge tag 'android-security-10.0.0_r53' into int/10/fp2

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  Revert "Revert "Revert "vold now prepares a subdirectory for face data."""

Change-Id: I934414d83db017556b7ecb32d43dea8cbc4b5d99