[automerger skipped] Merge "Fix SysUI volume controls not appearing" into sc-dev am: adc5f957 am: 66ad53f9 -s ours

am skip reason: Merged-In Ic44b48bb5605699b476af05407b90f2be5d70cd3 with SHA-1 8907455e is already in history

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

Change-Id: I3ab1c564796fdd8c523bed60402410c56439a956