[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 082403816a

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

Change-Id: I5f4fa53bdd66b01d491a7c1ac6dbac1e8ce2bc9e