Merge "Add transaction callback in SurfaceComposerClient::setBuffer" into tm-dev am: faa3b879 am: 4940c022

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



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