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

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

Change-Id: Ie3ff5a436caa8e6512382cee237f14795d4bc8ce