[automerger skipped] Merge "Update notification FSI logic for when device is...

[automerger skipped] Merge "Update notification FSI logic for when device is considered dreaming" into tm-qpr-dev am: 5ac43d6f am: 00afaefd -s ours am: 00a9833d -s ours

am skip reason: Merged-In I8e97fdb064c4b23517d69498638769aac26f419f with SHA-1 236b845e is already in history

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



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