Merge "Fix binder error about non-oneway biometric calls" into sc-v2-dev am: 555023b9dd

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

Change-Id: Ie116146dda8a68ec23d2b6be440bf5ffdc7a74f1