Merge "Add keepalive related methods and fields to system APIs"
am: a4885a0b8e

Change-Id: Ic557c3ece7b443124ca050e6c6bfd3a1f2d77c3b