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

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



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