Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev