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

Change-Id: I221da0882cec481f4f0e892d8eb19c196889db1a