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

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



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