commit 7cc2085e7ee20c950a6ad37a9619dc8216ff75e6
author Eva Bertels <evabertels@google.com> Thu Aug 16 12:58:39 2018 +0100
committer android-build-team Robot <android-build-team-robot@google.com> Fri Aug 24 22:00:34 2018 +0000
tree fda3190125995e478fe5dfb9599c12515e9e0d9d
parent c514b08c1074c95d72acac64759f8e614b4d1d85

Add check for misprovisioned Pixel 2 device.

Some Pixel devices had a wrong brand value provisioned into keymaster.
Due to this misprovisioning those devices fail device ID attestation because it includes a check for the correct brand value.
This is now solved by re-trying Device ID attestation if we are running
on a potentially misprovisioned device, allowing for the known incorrect
brand value.

Bug: 69471841
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Change-Id: I99108659f9a7b65d4f80f0a4631a382bfb076738
Merged-In: I6737184eb5a34cf3213f9cb1c5d5e2f1cf02ea38
(cherry picked from commit 74bf12f6b564fb136ab19532dad63ae985350060)