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

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

Change-Id: I06af5f32ada0d11d07f9f371b4f057f84249237a