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

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



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