Merge changes from topic "b190746471-status-bar-refactor" into sc-v2-dev am: 3921366d

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

Change-Id: Icabfdd87b6058ee1e8a5e24e774bf075f48e0fc0