[automerger skipped] Correct value of supported keepalive count for cellular am: a248130fc9 -s ours
am: d6ab738ff0 -s ours
am skip reason: change_id Ia3761f2e78d54866bb2e156d58004396bbc8adc3 with SHA1 c0de2838e7 is in history

Change-Id: I9caaa1a09ecc37735ef741e5ce43f42fa9a779e5