Merge changes from topic "mockito-upgrade-2-23-0" into main

* changes:
  Reapply "Fixed DefaultMockitoSession constructor"
  Reapply "New API to clean up all inline mocks after test"
  Upgrade mockito to version 2.23.0