Merge "Merge "Disables notification drag & drop." into tm-dev am: 1c121789...

Merge "Merge "Disables notification drag & drop." into tm-dev am: 1c121789 am: c1686d6f" into tm-d1-dev-plus-aosp am: 8574be7d

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



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