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

[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into tm-qpr-dev am: 19504bf7 am: 314f72a7 -s ours

am skip reason: Merged-In I666b9ee6b6076766513b97e675fdbaa002428601 with SHA-1 55e086c2 is already in history

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



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