Code cleanups in android.content.cts.ContentProviderTest Fixes: 418307584 Test: atest android.content.cts.ContentProviderTest Flag: TEST_ONLY Change-Id: Iaf82c91a2cd72b01b779d84d34237c4c4d288ad6