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

Change-Id: Ice95e4bf37bb746c95e99ec5922dffe8f0b7289e