Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId"
am: 6cc4c0c029

Change-Id: I17375b97d6c695f810ea23d6682bb598c5a55b35