Merge "[automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours" into android11-tests-dev am: 7988343ad3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: Id6b1d8f6257545cf352be385120e316c9e27397d