[automerger skipped] Optimize the handling of disabling doze state. am: 28d4a8f2af am: 15bcb7c340 am: 6c1afe25c5 -s ours

am skip reason: Merged-In I53e40af53aa00ff493e8e5050908220ae4dad729 with SHA-1 b5df9c503a is already in history

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

Change-Id: I11814eed0d76015861f48755baf3b5da1dde55da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>