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

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

Change-Id: Ia6343c364eec9af9ffff5fcae3ceb6518a1ab10c