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

* security-aosp-pi-release:
  [Passpoint] Remove R2 broadcasts

Change-Id: Ic9596f9202787b289f146cc6ae414283b4e1940e