So enroll can continue across configuration changes. Bug: 20495507 Change-Id: I021f2f3e376fcd12c7a698f5fb7f862733cb720a (cherry picked from commit 64e9c4cb2c)
64e9c4cb2c