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

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



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