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

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

Change-Id: Iab2844623bc214a88e1a3824c6b4cdaf25c0cbe6