Merge changes from topic "revert-13593269-QAPPBSWOVZ" into sc-dev

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