Merge "Fix potential NPE when looking up view tags for animating" into udc-dev am: a57a7086 am: 3a3186ce

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



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