Merge \"Merge \\\"Fixed another case where the systemUI could crashloop\\\"...
Merge \"Merge \\\"Fixed another case where the systemUI could crashloop\\\" into nyc-dev am: 02ab2f52 am: 24edc393\" into nyc-mr1-dev-plus-aosp
am: fbdcf855
Change-Id: I646731c2f91f4640e4cab4566e8c469ef6d4eb4f