Merge "Fix incorrect SID matching for bio prompts" am: 8d221843b7 am: 63a204f231

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

Change-Id: Ia0914bfef8ef44e0ab8c01cb92835619f0dc59c6