[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: e3eba132 am: df8bc34b am: 07267592 -s ours am: 5647b614 -s ours am: b23dcf9a -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/+/12687714

Change-Id: I4d27d56009248f5a026c9f1687bd2b63e9eba1f4