Merge "Change the parameter type from ContentResolver to Context" am: 8d638d9434 am: 8df3a6b774

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

Change-Id: I8553f5723308825239a08127ccd5f1cd6f2432f8
tree: 56b0faad67f17b4fd74b8d42c18bb55c6874e253
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS