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

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

Change-Id: I64b61b6c34f26595ba652375ba774e169cb93f78