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

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

Change-Id: Id60a72da081a9d44e31890a8e28b98fad9bdbd9c