Merge "Set the preferred SIM when InCallActivity is not visible."
am: 5749edd52e

Change-Id: I7645b88d533b7976688e276df7adff4f107a3f49