Merge "Consider subId when loading Call Settings and Dialer status hint strings" am: cf12354d5f
am: d95838ca6b

Change-Id: Ife77f11f8da63f9788e097d6fac108bafe98f614