[automerger skipped] Merge "RESTRICT AUTOMERGE Ensure that main executor is...

[automerger skipped] Merge "RESTRICT AUTOMERGE Ensure that main executor is used in Doze." into rvc-dev am: 48c40af5 am: 3e7ea78d am: ad293ce8 am: 392bc77c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11718819

Change-Id: I75307067a8836658df61f938f51030e00df76855