Merge "Don't yell when calling into SystemUI" into oc-dev am: 5286b96576
am: f5b8b9ccd8

Change-Id: Iee07bce280068961c29544eddbc2facd1d608462