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

Change-Id: Ibad73619b71c262e98889ef0dee2f278749a5258