Merge tag 'android-security-8.1.0_r87' into staging/lineage-15.1_merge_android-security-8.1.0_r87

Android security 8.1.0 release 87

* tag 'android-security-8.1.0_r87':
  Stop returning intent data in QuickContact in onActivityResult

Change-Id: I4c095729aa7326dea875a0a2478928a91bbb253c