Merge "Do not run mapLockTest on 4.9 kernels" into main am: f2315d018b am: 9b64ea30aa

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3151359

Change-Id: Ibd521e712f8d033f720f46ce7b5663f4311852f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>