Merge the 2020-10-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Protect Bluetooth device information when using NFC pairing

Change-Id: If27afe98dec818c4da89e4d126df5a08ab6a42df