[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: c7ebee8a -s ours
am skip reason: Change-Id I493e86324d3ed28338f3d017e14fe2e362b87c12 with SHA-1 4113a013 is in history
Change-Id: I4fe28c5b56c117ddad9de3bf70e8fec4ee64a5d2