Merge tag 'android-10.0.0_r46' into int/10/fp2

Android 10.0.0 release 46

* tag 'android-10.0.0_r46':
  [Passpoint] Remove R2 broadcasts
  Enterprise suggestion's catificate share same lifecycle as suggestion
  fix soft reboot caused by KeyStore exception
  [MAC rand] Removing persistent storage
  Revert "[MAC rand] Removing persistent storage"
  [MAC rand] Removing persistent storage
  Fix bootloop caused by null mIpClient in ClientModeImpl
  Give SetupWizard permission to set macRandomizationSetting
  WifiServiceImpl: Clear identity before retrieving app info
  WifiServiceImpl: Allow system apps to use legacy API surface

Change-Id: If47d5d60f6e910096a442997ad12478233f36b4e