Merge \\"Add explanatory text displayed when \\'Always-on\\' switch is...
Merge \\"Add explanatory text displayed when \\'Always-on\\' switch is greyed-out for VPN apps w/targetSdk<24\\" into nyc-mr1-dev am: 4ffd7552
am: 8dc82cb4
Change-Id: I826f79e845be20f687b96ba5ba551da13422fcee