Merge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979" into oc-dr1-dev-plus-aosp
am: 406ed3c9c4

Change-Id: I4198072198baa875517e326275fe726c8ccb0c2b