Merge "Fix NPE in DialogLaunchAnimator" into tm-qpr-dev am: 120867a3c9

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

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