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

Change-Id: Ia0c1e0511bffd630af4aae87cafd99e68a042149