Work around b/317972419

This CL works around b/317972419 by making the parameters of the movable
content of movable elements more explicit instead of relying on new
lambda creation.

Test: Manual. I added a test but it still fails, probably because of a
 bug in movableContentOf or in the testing libraries (see
 b/317972419#comment2 for details). I left the test in this CL but
 @Ignored it.
Bug: 317972419
Flag: N/A
Change-Id: Id54c237ea0b4f0e974a9cb9adcffb6426bf8e8c3