Merge "Excessive battery usage fix." am: 459d0ba244 am: 9a6519978b am: 883c58762b

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

Change-Id: I5e9d40eea2582118928dae033bf7261bb3a4192c