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

Change-Id: I7e3274d4d3a550d500fd36fff7d5eb28985bf236