Merge "Refactor PowerManager to make SystemProperties testable"