Merge "Fix OOM issue of InCallUI" am: d5e3de3253 am: f4744f532f
am: 0265226b66

Change-Id: I494318261aa048881dcd07b98fb2374f95f5f55e