Merge "CTS test for VpnService.isAlwaysOn & .isLockdownEnabled."
am: 30667cf8c0

Change-Id: I428c9fe6d03c18136ba38e5a52938eb0bf8e8a5c