[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: c9bed4b0 am: 1f122e53 am: fad948f2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id016b2bf1a157aca0dfa1a6260ed0b00d8642345