Revert "qcacld-3.0: Set RM capability independent of AP's capability"

qcacld-2.0 to qcacld-3.0 propagation

This reverts commit I6047d4dec19e7cd32d6733e4da773875bbbb31aa
"qcacld-3.0: Set RM capability independent of AP's capability".

This change is causing IoT issue with AP doesn't support 11k.

Also this change was already reverted as part of commit
I4e521dbdbdd5b083360405f26913278788c86555, however the revert
was not complete. Apply a clean revert for updating Capability
Info field.

Change-Id: I6ba3f9121e297c2433612859ab2bd5e2c05e17b3
CRs-Fixed: 1081890

core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -387,11 +387,10 @@ static void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
 		 */
 		caps &= (~LIM_SPECTRUM_MANAGEMENT_BIT_MASK);
 
-	/*
-	 * RM capability should be independent of AP's capabilities
-	 * Refer 8.4.1.4 Capability Information field in 802.11-2012
-	 * Do not modify it.
-	 */
+	/* Clear rrm bit if AP doesn't support it */
+	if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &
+		LIM_RRM_BIT_MASK))
+		caps &= (~LIM_RRM_BIT_MASK);
 
 	/* Clear short preamble bit if AP does not support it */
 	if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &