Merge "Fix Chooser-to-editor transition animation" into tm-qpr-dev am: 9b723322 am: 68242f1b

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



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