[automerger skipped] Merge "[KA09] add keepalive offload permission to shell" am: bc350db984 am: b15da9fb19
am: 2be1be0426 -s ours
am skip reason: change_id Ib6660a5eaa72f83042596481452be4d415383f02 with SHA1 5e430e5a39 is in history

Change-Id: I15932279b389865001eb32fb0161914e65bc9450