[automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev
am: d2a0d577f0 -s ours
am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history

Change-Id: I7016712b4c6d095ecc9abdaba94ff412844366ac
tree: 54e563aa8926e26002d210945a445e3f64403292
  1. tests/