[automerger skipped] Merge "RESTRICT AUTOMERGE Ensure that main executor is used in Doze." into rvc-dev am: 48c40af50a am: 3e7ea78d42 am: 758fbc0e76 am: e84b82792a -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
This commit is contained in: