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

* changes:
  Revert^2 "Try to ensure tests run sequentially"
  Fix NPE during fingerprint removal
  Revert^2 "Update RemovalClient to support new biometric AIDL"