[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: 4843e3fd -s ours am: 52dec242 -s ours am: acc8972d -s ours

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

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

Change-Id: Ib99b000e7b88ebd9816e1a12ee6854cb7e20a8d1