Merge "Mark system_ndebug_socket as mlstrustedobject." am: ad38a45cc3
am: e2acb915ad

Change-Id: I86368e4febe04d7dddc718316c1788c46f6ecb74