[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: 758fbc0e am: e84b8279 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I475b730e1e478f0d654b4c6d0dbc6f70a491839e