Merge "Correct value of supported keepalive count for cellular"
am: 68a4599a37

Change-Id: I317b6ec39f94c85c10217ac06f2811f79fa47be2