Merge "Remove pstore related test case from CTS" into oreo-mr1-cts-dev