Merge "Fix testAlwaysOnVpnAcrossReboot cts test" into pie-cts-dev am: 3dbc7f8f92
am: 06d39cf007

Change-Id: I9d2b02baa053e532f23485c486e9b978b79f71eb