Merge "Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()" into qt-dev am: be063ffb59
am: d48444551f

Change-Id: I9c6f6760b1be0b1e2c3971733b82770523c1240e