Merge "Revert "Removing unused surface transaction wrappers"" into tm-qpr-dev...

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

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



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