Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
am: 4c85840bd0

Change-Id: I26e3d04bb9c5c895bf8f9a20d3cc1c5caf87db1e