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

Change-Id: Ic557c3ece7b443124ca050e6c6bfd3a1f2d77c3b
tree: b3e931f5d4444dc830bd1c752f8f3d9ead3d21cc
  1. core/
  2. services/
  3. tests/