[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent"" into sc-v2-dev am: 60422ba05a am: c7aeac6efb -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16238819 Change-Id: I74430f5645c5244e4c49738321dac985586e2a33
This commit is contained in: