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

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

Change-Id: I930a6fdb3073b172483a3d331323ad722b0e5a06