Merge "deviceandprofileowner: wait before checking vpn status" into oreo-mr1-cts-dev