Merge "Reduce unnecessary overhead of SystemUiContext" into sc-v2-dev am: 7b7568a112 am: 36a3e25ada

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

Change-Id: I9da31244a433a47f0870e3483a894a3e19f9747f