Merge "Optimize the handling of disabling doze state." into tm-dev am: 683b75dd

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



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