Merge "Add FLAG_CANCEL_CURRENT to screenshot share intent" into rvc-dev am: 98b129d012 am: 7f48aa3556 am: a5c50feb54

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

Change-Id: Idf96cadd4bc70d11b7c00ad457341143fa626b56