Merge changes from topic "am-32562e4e7a11481995df723a3616eb3d" into android12L-tests-dev

* changes:
  Merge changes from topic "am-abd98aeb0e0a4e1bb1c8f1becae1dd08" into android12-tests-dev am: 22026beaab
  [automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours am: cc1a7a2abb -s ours am: a5cdf4bdae -s ours