Merge "Correct value of supported keepalive count for cellular" am: 7423873ac8
am: 056eeae27c

Change-Id: If833b813ba00eeff913160598f1ea9c74e6e35d8
tree: cf9870f726595ae834b71c026ddae2447e47f116
  1. core/
  2. services/
  3. tests/