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

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

Change-Id: I1af88a2b2fbc74eede163ddaeb786cc4e543efdd