Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev am: 2cbe6aa96b
am: 016be7dc01

Change-Id: I26abb7ac25f3d738871f7d5b2345620af467d04c