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 am: c42f776d

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

Change-Id: I327514b1f71b9c483ba7d98655659733a3fbd02c