Merge "Ensure doze sensors can be registered when screen on." into rvc-d1-dev...

Merge "Ensure doze sensors can be registered when screen on." into rvc-d1-dev am: fe98465d am: ca7efc5c am: 0cc8ff23

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

Change-Id: I518f4f84fb97a7e6dada0fb3af5596ef0385d7f8