Merge "RESTRICT AUTOMERGE Ensure that main executor is used in Doze." into rvc-dev am: 48c40af50a am: 3e7ea78d42

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

Change-Id: Ic865c218a4727ba1ac40b38a3e47b824041a8155