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

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



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