Merge "Merge "Use existing content resolver" into rvc-dev am: 97e7461981 am: 91df39c681" into rvc-d1-dev-plus-aosp am: e9fb036325 am: e82f5f95ad
Change-Id: Ieae46fc2667083b6a5bb5ff3784c9dfe147fd511
This commit is contained in: