Merge "Fix binder error about non-oneway biometric calls" into sc-v2-dev