tree bfabfd9a8e7b57910480c8e9bb981c76c866b041
parent 02fbbc154a9c36ff9e7f030f63d1051add9d1909
author Craig Lafayette <craiglafa@google.com> 1433277338 -0400
committer Craig Lafayette <craiglafa@google.com> 1433774112 -0400

Remove FRP wipe via NFC bump.

- Remove the WipeResetProtectionTask
- Move FRP check to DeviceOwnerPreProvisioningActivity

Bug: 21558883
Change-Id: Ic686c72d4a3984436f1bb28c271c248fedc46091