Merge "Fix inattentive sleep failing to go to sleep while dreaming" into tm-dev am: 641fbeb1

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

Change-Id: I777d0427500b9c6db40311ab4b4d2d298b7f4a13