[automerger skipped] Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 4c85840bd0 am: 5ccdd4fc53 am: f39d8f016f -s ours
am skip reason: Change-Id I94171b2dc4f26442df918547bf8bc40953f63f2e with SHA-1 bd47e8cde8 is in history

Change-Id: Iaccbabe29656681be9894076e0064a25ca894587