Merge "Initialize content resolver in ctor" into sc-v2-dev am: c07b6d26c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16373383

Change-Id: I86feb78d8d27d9789ba7f15d4d87b7b6e2b7a0b7