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

Merge "[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into tm-dev am: 3d69645a am: b5364b05 -s ours" into udc-dev am: 5f7d0f34 -s ours am: e65eb648 -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: I98c4636f3611650450bb55c808870f26eccd0b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>