Merge "Change the parameter type from ContentResolver to Context" am: 253a041a13

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

Change-Id: I6a91019bf0b10175885d146e77f98533ad702f8c
tree: 058081071ac789e2962447ab12ac73b8457adeee
  1. framework/
  2. service/
  3. OWNERS