Merge "Set position during TRANSIT_ENTER_DESKTOP_MODE transition" into...

Merge "Set position during TRANSIT_ENTER_DESKTOP_MODE transition" into udc-qpr-dev am: b818c6e7 am: 523fe166

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



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