[automerger skipped] Merge "Revert "Move test_floor0 in tests to a sub-folder"" am: 84904b9a18 am: 6c0d30f0aa -s ours

am skip reason: skipped by user essick

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1486757

Change-Id: I17592ac10f3e8bdddc8a801c14822ff432776a85