[automerger skipped] Merge "Excessive battery usage fix." am: 459d0ba2 am:...

[automerger skipped] Merge "Excessive battery usage fix." am: 459d0ba2 am: 9a651997 am: 883c5876 am: 867f2a36 -s ours am: 0797d796 -s ours

am skip reason: Change-Id If65f65f9214b34bf057ed5f1877348d835251d14 with SHA-1 74fcc57e is in history

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

Change-Id: I9a6b7bd21ba9bc20bd00b74cfeb6f78952f5703a