Merge "Skip null surface when validating transition" into udc-dev am:...

Merge "Skip null surface when validating transition" into udc-dev am: 4bc363b9 am: d87a7fb1 am: ef8d0fc2 am: fa664bb2

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



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