Merge "Correct value of supported keepalive count for cellular" am: 68a4599a37 am: 056eeae27c am: 680abbb591
am: 734d90759a

Change-Id: I621066b8c4cd9b244b4d70f84d428b5b784e0387