Merge "Enable QS button for new power menu in AOSP" into sc-dev am: 508447f1 am: 633dc433 am: 7bf5f357

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

Change-Id: Ic5649beeb692ee20139ed11e5a390be4466af899