Merge "Revert "[Bouncer] ensure bouncer not shown with doze state."" into tm-qpr-dev am: deb15793

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



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