[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 am: c4f2ea4b -s ours am: 0f4c9658 -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: I6a38dfb1290a3c6ec567ba68e91dc4c8d1092f64