Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-v2-dev-plus-aosp