Optimize the handling of disabling doze state. am: 28d4a8f2

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



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