Merge "Improve StrictMode CTS Testing"