Merge "Merge changes from topic 'hide_passpoint_r2' into oc-dev am: 4bd47fce" into oc-dev-plus-aosp am: 90ba8c05 Change-Id: Ic6ff02e300cd770bb3f35b8b62b1aea1fa0d5bbc