Merge "Fix accident evict if drag same app to same position." into udc-dev am:...

Merge "Fix accident evict if drag same app to same position." into udc-dev am: cf02b08d am: e063478a

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



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