Merge "Fix allowlist for unreliable pinning." am: 0198ce0ca7 am: 833c1b98b3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393698

Change-Id: I7cbf81d40e1996811faf4a36b0bde44c22a2acf8