Merge "Update CTS tests: acquireContentProviderClient now requires permission" into klp-dev