[automerger skipped] Optimize the handling of disabling doze state. am: 28d4a8f2 am: 15bcb7c3 am: 6c1afe25 -s ours am: e60c3ae3 -s ours am: a074e6e0 -s ours

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

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



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