Merge "Merge changes from topic 'hide_passpoint_r2' into oc-dev am: 4bd47fce86" into oc-dev-plus-aosp