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

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



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