Merge "Don't unregister doze sensors that have been requested" into...

Merge "Don't unregister doze sensors that have been requested" into sc-qpr1-dev am: 1f1ec17f am: 1378749f

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

Change-Id: I0329d97e9735d08d502e35e27ac694a2d218ede6