[automerger skipped] Merge "Added check for misprovisioned Pixel 2 device." into pi-dev am: ec94be1526
am: eeedc9e276  -s ours

Change-Id: Ieac724eaf58781c974b830b450a23988533c631b