Merge tag 'android-security-8.1.0_r85' of...

Merge tag 'android-security-8.1.0_r85' of https://android.googlesource.com/platform/frameworks/base into staging/lineage-15.1_merge_android-security-8.1.0_r85

Android security 8.1.0 release 85

* tag 'android-security-8.1.0_r85' of https://android.googlesource.com/platform/frameworks/base:
  RESTRICT AUTOMERGE Ensure caller identity is restored in CP quick-path.
  Remove updateIntentVerificationStatusAsUser from ResolverActivity
  Revoke the uri permission when the file is deleted
  [RESTRICT AUTOMERGE] Restrict app transition maximum duration

Change-Id: I30d0743e3b75a2e87b3c26e318db5711e82a0eaa