Automatic translation import

Change-Id: If0e369a67e39de21e48fe00fc5a32fcd7c9777a4
InCallUI: Workaround for aapt warnings

Change-Id: I1b28aca47f69b5559152e7bc23371a54bd9a47e4
Merge remote-tracking branch 'cm/cm-11.0' into HEAD