Merge "Enable flagging shortcut with additional activity flags" into...

Merge "Enable flagging shortcut with additional activity flags" into tm-qpr-dev am: 4a0e698b am: f11a7984

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



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