Merge "[KA09] add keepalive offload permission to shell"
am: bc350db984

Change-Id: Ica5b5ec05731a7c840d1f7dd1534d532c524df04