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

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

Change-Id: Iddf21b70bf28a022cb5903d0c855082e3c3ecede