Merge changes I3fdb3fe0,I59f6e607 into sc-dev

* changes:
  Try to ensure tests run sequentially
  Update RemovalClient to support new biometric AIDL