Merge "Adding user consent extras to DevicePolicyManager."