Merge changes from topic "b190746471-status-bar-refactor" into sc-v2-dev am: 52ef77fab0 am: bde48b9bfb

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

Change-Id: Ife2f50a5c3a70a6462bbffd93c4d572b50f1c0fd