[automerger skipped] Merge "[DO NOT MERGE] Allows the Assistant to request suppression of fling" into qt-qpr1-dev am: fe399658d8 -s ours

am skip reason: subject contains skip directive

Change-Id: I040bac7bae2bee3334fd5a433a042009aa1b85ec