[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: 2aafeca1 am: f420fd59 -s ours
am skip reason: Change-Id I493e86324d3ed28338f3d017e14fe2e362b87c12 with SHA-1 0fe44786 is in history
Change-Id: I3a7e1d03880d607877c3e645cad68a951382d3d0