Merge "Fix edit button in screenshot share activity" am: d7013fb9 am: c6158cc8

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



Change-Id: I2e4e50e79a97eaea2871cc6a743417c4b4aab588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>