tree 04a10e3a56ef7b7b5a0f75a417b3c57940d2f443
parent 04b832c109061e8359d0ad23ed42555971278605
parent 4a1225eb1f52057112e4d85b01d460556d85c87b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582859053 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582859053 +0000

[automerger skipped] hidl/1.2: Don't set WPA_KEY_MGMT_FT_SAE key management. am: bd90854778 -s ours am: 1fc679c6db am: e1c342dd09 am: 5e1db366c4 am: 4a1225eb1f

Change-Id: Iff6862904e24420a2fa6b3bc51c8fed25da26656