Merge "Soft-Ap: Add API to enable Beacon Protection and OCV" into r-keystone-qcom-dev