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

Change-Id: I22baa14ff5135b22d574ba5b1587802c5f8e2ebf