Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24" into nyc-mr1-dev