Merge "Change the parameter type from ContentResolver to Context" into sc-dev am: ddd843d7 am: e354d9ec

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

Change-Id: I2e1ecd13287eafb3a88f42dd001084a7c9e2121a