[automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0 -s ours
am:f5e8bf5b79-s ours am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1063b4e109eis in history Change-Id: I2895f11abcbea5fe73ef91b359d8d634af77d810
This commit is contained in: