[automerger skipped] Merge "Fix full draw power usage increase issue" am:...

[automerger skipped] Merge "Fix full draw  power usage increase issue" am: 6434804c am: 3993324e am: f935ce25 am: fea1cc69 -s ours

am skip reason: Merged-In Ic6f21e7b9dc5e7c8f36d03c57b01fa7210cff86f with SHA-1 cd8994f4 is already in history

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

Change-Id: Id565b58932adcfa76826d206bdce1fb99f35e6d7