Merge "Merge "Fix timing issue for testAlwaysOnVpnPackageUninstalled test cases" into oreo-cts-dev am: ced6c920fe" into oreo-mr1-cts-dev