Merge "Use IndentingPrintWriter in DevicePolicyManager"