Merge "CtsKernelConfigTestCases secondary_user"
am: b8d12d31f1

Change-Id: I5546a80c7ebcf088ae7546534da825048f824171