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

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

Change-Id: Ib8ffe6fd8bdeec88cfe87e7f544c39212905b901