[automerger skipped] Revert "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" am: 930739c45a am: 29283a4610 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16238819 Change-Id: I9ac64959c39f3762546c64bcce3983bf0836812b
This commit is contained in: