Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev