Merge "Fix crash in Google TV app caused by animator change" into udc-dev am: 71dac9db

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



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