Merge "Fix issue with both shell and launcher updating drag surface" into tm-qpr-dev am: e7b36658

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



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