Merge "wcnss: Add Riva 'power on lock' APIs" into msm-3.0