Merge "Revert "Removing unused surface transaction wrappers"" into tm-qpr-dev am: 6d8c4603

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



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