Merge "Fix the problem that system apps cannot drag" am: 0d6c423c am:...

Merge "Fix the problem that system apps cannot drag" am: 0d6c423c am: f2633cb7 am: a78c925c am: 53038bd2 am: a1107255

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



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