Merge "Revert^2 "Removing unused surface transaction wrappers"" into tm-qpr-dev am: f7c759be

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20215465



Change-Id: I6e12e4ee652a0cb502f5e3c0aa188d7df6d3ca7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>