Merge "Add more assertions related to LocalServerSocket.accept()" am: 863ff4a2cb am: a0c574dcc7
am: 0c14426eac

Change-Id: I828deb004fe018e6bdfb5801b067ee067a2883eb