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

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

Change-Id: Ie40781a9f868b9aac8eb55b93f3eedd029658806