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

Change-Id: I2b807be9ff69796ccc3dde64fb215250d9690717