Automatic translation import

Change-Id: Ie500b688966b0fb64b2434d3bc0bd286753ecf05
Automatic translation import

Change-Id: Ib876820a766c488e4722604e90d3fc2910b22c38
MSIM(DSDA): Leave subscription alone on non-MSIM devices

Change-Id: Icdd06ab9b3f946f7fb8bc2a3e51a5e5dea948b0d
Automatic translation import

Change-Id: If0e369a67e39de21e48fe00fc5a32fcd7c9777a4
InCallUI: Workaround for aapt warnings

Change-Id: I1b28aca47f69b5559152e7bc23371a54bd9a47e4
Merge branch 'upstream/cm-11.0'