Merge "Remove FILS AKM changes from validateKeyMgmt()" into rvc-dev