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

Change-Id: I00be7bd4add00c3499fa4e862fb3508354735ff1