Merge "Add URSP matching failures as permanent failures" am: 47685a9798

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

Change-Id: I1e9c6a6a10f858b29199f12a71a6e60e21ec6f73