Merge "Catch Netd exceptions to avoid runtime restart" am: 1f025e18eb

Original change: undetermined

Change-Id: I01f25837b95daa4ef661f72c80e2b4d60fa16888