Merge changes from topic "am-abd98aeb0e0a4e1bb1c8f1becae1dd08" into android12-tests-dev

* changes:
  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
  [automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours am: cc1a7a2abb -s ours