Code cleanups in android.content.cts.CtsMediaProviderClientRefCountTest Fixes: 420241234 Test: atest android.content.cts.CtsMediaProviderClientRefCountTest Flag: TEST_ONLY Change-Id: Icc614d727298be88aa39997909ffec418d433daa