[automerger skipped] Merge "Fix incorrect SID matching for bio prompts" into...

[automerger skipped] Merge "Fix incorrect SID matching for bio prompts" into sc-v2-dev am: 98ec23dc -s ours am: 726cea78 -s ours

am skip reason: Merged-In Ib95b0564aa098157718b8d4a45b11baa69dad71b with SHA-1 c78e369c is already in history

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

Change-Id: I279107d2dfdfb22972219c03ba0db3f48e156975