Using Transaction directly instead of building surface params

Bug: 221961069
Test: Presubmit
Change-Id: I31123dff78de513addd0c851403af9097686c46e
16 files changed