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

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

Change-Id: Ia1ce97618fd0b9f89ff0df2944f74ab8b88bd644