Change-Id: Ib8f20a16b14559b62835e07efa86076c54c5d369

This is only present in the configs of china MIUI

Change-Id: Iaab8572d4ed56d02439ca6ae2d51ade6bbdfb7ee

* matches stock 11

Enable driver param "no_rrm=1" in wpa_supplicant_overlay.conf
for all targets. Since location modules need the registration
of rrm frames, it is disabled in wpa_supplicant for all targets

CRs-Fixed: 2693388
Change-Id: I13fb4aabe4edb25d3d0cda30a16e69d6fbf35334

With this patch nfc interface info in wps information element is
disabled and only certified config methods are enabled.

Change-Id: Iea297426ddc078172f5c71575656c65bcada9d5f
CRs-Fixed: 2680762

Bug: 138790309
Test: boot and wifi function is ok
Change-Id: Icea6361942873b5177c5fa59f9628c3b383b4509