Merge "Disable libcore.libcore.io.FdsanTest#testSocket on target."
am: a910f66e2a

Change-Id: Iea7c13e0026d831c8177948ea067af6ed81be5f6