[automerger skipped] Merge "Add keepalive related methods and fields to system APIs" am: b7d665988d am: 23a2ee7ac2 am: 61c7ade3a8 -s ours
am skip reason: Change-Id I2d982e8abb5cb6b4c74a20483550b18cf814320d with SHA-1 17c660dfeb is in history

Change-Id: Iac4c0a4c7d56693fe3505336c007565ac3ce76f8