[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 0aa48757 am: 825bc7bb am: 33f340b5 -s ours am: dd5bb95b -s ours

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

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

Change-Id: I557b62c41750f81bfcaa9de68d24a12c33bdb0a3