[automerger skipped] Merge "Call e.rethrowFromSystemServer() to exception of...
[automerger skipped] Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId" am: 6cc4c0c0 am: feee99e5
am: f3d7a41d -s ours
am skip reason: change_id Ica15965cb904b758e078b8439e5e9d3f39b9c0a2 with SHA1 04e94fcb is in history
Change-Id: If01773b3cf51fad385a02ab9e769478ca5adec4c