[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for...

[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into tm-dev am: 3d69645a am: 04ce5cc1 -s ours am: 6297c432 -s ours

am skip reason: Merged-In I666b9ee6b6076766513b97e675fdbaa002428601 with SHA-1 65ac64c3 is already in history

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



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