commit ef8b1a63ba4a1a1d72d8d6354d8cdbf3e0e9540d
author Kevin F. Haggerty <haggertk@lineageos.org> Mon Jun 01 21:10:38 2020 -0600
committer Kevin F. Haggerty <haggertk@lineageos.org> Mon Jun 01 21:10:38 2020 -0600
tree 7dcde6f33951f4e22d91297f1ba6699dc4b2a8aa
parent a28db699f2898e1f2ed695f6adccd47e1f654bf4
parent 522cdf0da0b7d09b7254a7cda53ff8b5efc7da27

Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37

Android 10.0.0 Release 37 (QQ3A.200605.001)

* tag 'android-10.0.0_r37':
  Enterprise suggestion's catificate share same lifecycle as suggestion
  [Passpoint] Fix Passpoint matching algorithm for Home networks
  [WifiConfigManager] Log the disable reason when re-enabling.
  Fix removing enterprise suggestion certificate
  Enterprise suggestion's catificate share same lifecycle as suggestion
  Add EAP methods in WifiMetrics
  fix soft reboot caused by KeyStore exception
  fix soft reboot caused by KeyStore exception

Change-Id: Icd34f29b28ee6c2d329259b14d1c4ecbd8ae5824