Merge "Fix testApfFilterKeepaliveAck."
am: 60e7162e05

Change-Id: I9bfebe02c0d4bc9c389e1303017b8c46ad9aea2c