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

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

Change-Id: I4a5efbd249d4df6e2c6b5d50448d74e3e06a5f1c