Merge "Fix potential NPE when looking up view tags for animating" into udc-dev am: a57a7086eb am: 08ec8c06c9

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

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