Merge changes from topic "revert-3085486-cherrypicker-L33500030003548614:N45100030056225643-AHBLMNZHOI" into main

* changes:
  Revert "Fix LargeTopAppBarNestedScrollConnectionTest for ag/26995613"
  Revert "[STL] Address API council feedback on ApproachLayoutModi..."