[automerger skipped] Merge "Don't schedule SurfaceControl transaction if it is...

[automerger skipped] Merge "Don't schedule SurfaceControl transaction if it is not valid" into tm-d1-dev am: e0c7fee3 -s ours

am skip reason: Merged-In I86f8372c7de8234f5f1dd941dbf1c9eb9fbef647 with SHA-1 639ce391 is already in history

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



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