[automerger skipped] Merge "Add URSP matching failures as permanent failures"...

[automerger skipped] Merge "Add URSP matching failures as permanent failures" am: 47685a97 am: 8a5b7244 -s ours

am skip reason: Merged-In I641ff0a9f6d96ba2bcc07cfebf54205d46e0e5ef with SHA-1 d86b2e7c is already in history

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

Change-Id: I053dee4ff86791e037ae1fca593f84b9c96fc7de