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

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

Change-Id: Ie3bb28dca92400d71eb1933aa0e9044ab285bee6