[automerger skipped] Merge "Use main executor for Doze related stuff." into...
[automerger skipped] Merge "Use main executor for Doze related stuff." into rvc-d1-dev am: 603c4010 am: f198fff1 -s ours
am skip reason: Change-Id I493e86324d3ed28338f3d017e14fe2e362b87c12 with SHA-1 4113a013 is in history
Change-Id: Ic95f33267de4e42a46e615a8f45fb1c828622f5e