[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: 7af30ef7 -s ours

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

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

Change-Id: I0aba46817799e42005d81b0b92270b275b29d6d3