Merge "android.provider.Setting test utilities"