Merge "Merge "Collect VINTF, SEPolicy, and kernel config only on Treble devices" into oreo-cts-dev am: 78c42a6125"