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

Change-Id: I956b7876278f7e3e83cdb893bed653e62dfb4f5e