Merge "AlwaysOnVpnMultiStageTest: Fix error seen in newer kernels"
am: 234fdd455d

Change-Id: If79cde67c5a5c051cd0e648a4354544db0647b97