[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 8d638d9434 am: 8df3a6b774 am: c6bd2f85e6 -s ours

am skip reason: skip tag Change-Id I5702c7d74b862a76558b94f1abe2c6df9eb7f097 with SHA-1 acd3ded007 is already in history

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

Change-Id: Id713c440298bb0c410fbba74cb62550e1d5f90e9
tree: 7883f65849a51e8464477eafef437e256ab3b93d
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS