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

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



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