Merge "Switch order of settings and power" into sc-dev am: 00529400 am: e3c84005

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

Change-Id: I1ea0b5e99e76938abf144380b0d2c1c0af0898c3