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

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

Change-Id: I582304f7b26cf9a7767b46ceab2aafccafe79cdf