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

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



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