Merge "[CTS] [tagging] Move to 'instrument' for kernel ABI check." am: 5d9b8c1988 am: 3d997a4d83

Original change: https://android-review.googlesource.com/c/platform/cts/+/1677621

Change-Id: I463417193b98b7d8de5f669a75afd5f6a45e4ea2