Merge "Fix full draw  power usage increase issue" am: 6434804c00

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

Change-Id: I0aa9056683aae9ed3adc1ba78fa574a210b9c1f1