Merge "Fix 2527411: Extend sample DPM app to test setMaximumTimeToLock()" into froyo