Merge "Excessive battery usage fix." into rvc-qpr-dev am: fd55a98702

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

Change-Id: Ied1283b556a86c8c69c9a4f6dac18a2f1d1a0db0