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

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

Change-Id: I0de624270a08cf730a24cd3e7e5fc043ab5d5432