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

Change-Id: I9e84ae5c1729bd417d449d18eec0449c40029a2c