Merge tag 'android-security-13.0.0_r21' into staging/lineage-20.0_android-security-13.0.0_r21

Android security 13.0.0 release 21

* tag 'android-security-13.0.0_r21':
  RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()
  DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter

Change-Id: I28fde5eddf5b3ba88bcea1c154a65ae7d9951cf8