Merge "Work on issue #26879170: Adjust doze maintenance windows..." into nyc-dev
am: 7a6dc6c

* commit '7a6dc6cdfffa8ff8eea1c7c5f070cb318d0b02ce':
  Work on issue #26879170: Adjust doze maintenance windows...

Change-Id: I24e28a439f7b735240ab7685c9eeba7c88db681c