[automerger skipped] Merge "Add keepalive related methods and fields to system APIs" am: 434bc5adf4 am: 57e9fd7e5a am: 6e6fd92d08 -s ours
am skip reason: Change-Id I2d982e8abb5cb6b4c74a20483550b18cf814320d with SHA-1 5a916810c6 is in history

Change-Id: Iac4c0a4c7d56693fe3505336c007565ac3ce76f8
tree: 6b0fe7b9697961d0550fbaed88ba097da4865876
  1. core/
  2. services/
  3. tests/