[automerger skipped] Fix the issue provider can be wrong when requesting slice...

[automerger skipped] Fix the issue provider can be wrong when requesting slice permission am: 4cab9c38 -s ours am: f994f0c0 -s ours

am skip reason: Change-Id I8b66c02786df4096dad74b7e76255d5ddd1d609d with SHA-1 e3eba132 is in history

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

Change-Id: I0c21c95f2f53a7fe00d752d1eb1624e3e94a1993