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

Change-Id: Idfaa947996841f29bfbffd07a8c5eeff1118dd54