Merge "qcacld-3.0: Check the p2p roc timer state by acquiring timer lock" into wlan-cld3.driver.lnx.2.0