Merge "Merge android10-tests-dev into android11-tests-dev" into android11-tests-dev am: 37aa9cb594

Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/1464382

Change-Id: I7f3cc42e5b09d366655519f7a5034e1666e5fe11