[automerger skipped] Merge "Fix the issue provider can be wrong when...

[automerger skipped] Merge "Fix the issue provider can be wrong when requesting slice permission" into qt-dev am: d665f5e6 -s ours am: b3069d38 -s ours am: fafef50b -s ours am: faab5ace -s ours am: 177da181 -s ours am: 1b0f6641 -s ours

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

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

Change-Id: Idfe4f6f9f6748090b1c1ebd84fc07db884edced0