Merge "Add FLAG_CANCEL_CURRENT to screenshot share intent" into rvc-dev am: 98b129d012 am: 9285a2657b am: 88d687b6b6

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

Change-Id: I3cb488737127b46774acd322a6db04b3abf0b99b