Merge "Fix DevicePolicyManager setTime() behavior / tests" am: 7d64d299a3
am: ce0ca9c511

Change-Id: I18dcae8f36f4af87aa45e10ded7bfe15f9ecb0c2