Merge "Add keepalive related methods and fields to system APIs" am: b7d665988d am: 23a2ee7ac2

Change-Id: Ie4cd12bb96a42f414d7026828e72eea16f4bd073