Merge "Adjust SystemUI PowerModule" into sc-dev am: 614b1e94ae am: 589b23e1eb

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

Change-Id: I6962df603abf312ff84e6236a4bbb096da4686fd