Merge "Enable flagging shortcut with no_user_action flag" into tm-qpr-dev am: eb47deb3

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



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