Merge "Fix narrow statusbar when folding" into sc-v2-dev am: 4003a0d744 am: 2367ce39e3

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

Change-Id: Ic53908a4725c37d79576c10321a1ee21f23403f7