Merge "Prevent NFE in SystemUI when parsing invalid int" am: 9d7e1fe726
am: c59c6ca9a1

Change-Id: I178f593072e901343b57f2c03f2bd8da20811c9e