[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 253a041a13 am: 47984f7022 am: 33f340b54a -s ours

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

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

Change-Id: Id713c440298bb0c410fbba74cb62550e1d5f90e9