Merge "Fixes the system server crash issue caused by uncatched exception."
am: b68106cf2a

Change-Id: Ia28f7bdad020dbb3695934cae1f193037de41fcb