[automerger skipped] Merge "Move test_floor0 in tests to a sub-folder" am: 1b093f98c4 am: 485210576b -s ours

am skip reason: skipped by user essick

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

Change-Id: I1e37e8512e3edaf1887f17ee82ed6cd4a38814e9