Bug: 128903949 Test: atest android.content.cts.ContentResolverTest Change-Id: Idb9e63a68dc9ffe0c35ad3e6bff55aaa10320e81