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

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

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