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

Merge "Skip null surface when validating transition" into udc-dev am: 4bc363b9 am: a56a9d9a am: 83ce7a32 am: d9144a1f

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



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