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

Change-Id: Ic50eca6f96d23cb2973955d45ffdf4b0b4c3ee5d