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

Change-Id: Ib3fb3ef69b98879badb26a02570e2089aee2df12