Merge "Change the parameter type from ContentResolver to Context" am: 0aa487570c am: 825bc7bb90

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

Change-Id: I8553f5723308825239a08127ccd5f1cd6f2432f8