Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1"

* changes:
  Merge changes from topic "am-32562e4e7a11481995df723a3616eb3d" into android12L-tests-dev am: fd515cbdfd
  [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 am: 8dabf09a22 -s ours