Merge "StatusBar: Catch OOM caused by third-party icons"
am: ed112e3c11

Change-Id: I60313cc9a4560fd8e8308108a4d878ab49fcbea1