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

Change-Id: I66ae1fa82b48d42faf80a3e826f22878095f7f43