Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev am: 5b210b31f0

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

Change-Id: I4988ed358c9a7d4d7332027151843e867e392164