Merge changes from topic "am-3cc96f95c6a14511bf2fb86b3c05dc4c" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Don't schedule SurfaceControl transaction if it is not valid" into tm-d1-dev am: e0c7fee3 -s ours am: 86fe580e -s ours
  [automerger skipped] Don't schedule SurfaceControl transaction if it is not valid am: 5b9c3bf2 -s ours am: d0e91941 -s ours