Merge "Removing unused surface transaction wrappers" into tm-qpr-dev am: b45f7506 am: b5a5e1b1

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



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