Merge "Use the correct FGS View when animating into a dialog" into tm-qpr-dev am: ca7734905b am: 75a91c5394

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

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