Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" am: b4b9d21bf9 am: 359d910373
am: 541d4253b8

Change-Id: Ie7592062bdc53a6099ee6883d2d6bd0ecbe59291