Merge the 2021-03-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Stop returning intent data in QuickContact in onActivityResult

Change-Id: I904e12aa5e9162c1a5bf21d9da366b9cf8293d17