Merge \\"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am: 576e6d27 am: c7ebca2a Change-Id: I3cc1de9010c77d1de0f36e6ad164ff107d176cbe