[automerger skipped] [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 71b2172abc am: 13f7c9ec32 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I094dc98ae222e8ebeed7f3a11157c237aad907ca