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

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

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

Change-Id: I3279350d9c178550bdef4a16b308f530f725e990