Merge "Changing the value of the user consent extra in DevicePolicyManager."