Test cases:
1) Non-gms - pass
2) GMS w/ Pixel2 Google SetupWizard - pass

Change-Id: Ic6d86e1a08716d26299925c8db9dde768e5e7ec0