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

Change-Id: I8074c8d06a4c5cb804f8f36ad3ca18846b4263fd