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

[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into sc-v2-dev am: b70d57a0 -s ours am: e14be8b3 -s ours am: 8aa05a4f -s ours

am skip reason: Merged-In I666b9ee6b6076766513b97e675fdbaa002428601 with SHA-1 6d848929 is already in history

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



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