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

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

Change-Id: I2d4f07734b85226654495770e311c0b22d8014de