Merge "Add checks around CONTROL_VPN permission during prepare()"