Merge "AlwaysOnVpnMultiStageTest: Fix error seen in newer kernels" into nougat-mr1-cts-dev