Merge "Ensure pstore has data before running CtsKernelConfigTestCases. am: b7c25d7f0a am: 5b5c1421ba" into oc-dr1-dev-plus-aosp