Merge "Fix issue with both shell and launcher updating drag surface" into...

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

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



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