Test upsert Bug: 149300533 Test: atest MediaStore_Images_MediaTest#testUpsert Change-Id: I68725daebbca281af3eda2c4796f7ec9fd7a71e4 Merged-In: I68725daebbca281af3eda2c4796f7ec9fd7a71e4 (cherry picked from commit 9b2c297d1ddce73eaebcf85baa18b5d432808857)