Merge "Fixing "adb shell cmd statusbar expand-settings" command in split...

Merge "Fixing "adb shell cmd statusbar expand-settings" command in split shade" into tm-dev am: 8b644eff am: a246fe9a am: 9b1d768a

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



Change-Id: I2c05c05346bebf8120dc83e6375de4f3866f542e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>