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: b6f895d6 am: 85ea1626

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

Change-Id: I0532807104030cc401c32d0c26c59143bdf4d83b