Merge "Revert "Revert "Making mirror slider appear when brightness slider is...

Merge "Revert "Revert "Making mirror slider appear when brightness slider is used in split shade""" into sc-v2-dev am: ed4d4329 am: 3d3a6957

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

Change-Id: I6d53e3ecaa0253c65b3e81b1fdcac43c5b3942d6