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

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

Change-Id: I1659917b7fa9bdb0ceff47b34c0fa70161a972b8