[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: 9255a0f3 -s ours am: 14456959 -s ours am: ba2f455d -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: Ib6e7494d6a401141fc8135cd9a7b5055c7d27f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>