[automerger skipped] [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 08240381 am: cb89941f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie7f37b25fcc3b29f3865aee01407bf3bc72985d3