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

Change-Id: Ic015f0f87d7d8044701d9326afdd71893879f3b0