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

Change-Id: Ida3b992b69beceff700e67ceea075663720c6904