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

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

Change-Id: I171f798165447f0458c9aaff6842fc2208c22213