Merge "Rename two part drag to freeform transitions" into udc-qpr-dev am: 990069ff am: b5207e55

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



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