[automerger skipped] Merge "[DO NOT MERGE] Allows the Assistant to request...

[automerger skipped] Merge "[DO NOT MERGE] Allows the Assistant to request suppression of fling" into qt-qpr1-dev am: fe399658 -s ours am: 1413c3c4 am: a9bf8bfa am: b47fbea3 am: 1a8f5c3b am: bca80a77 -s ours

am skip reason: subject contains skip directive

Change-Id: I4a9d149f03916728f87de569a1c327b9f5154a3f