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

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

Change-Id: I534077191bdfcae2809e85910b433f1e0e897ef2