Removing unused surface transaction wrappers Bug: 221961069 Test: Presubmit Change-Id: I2e2526d215ab2c9acfd0ae1f86711d9681f62f19