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

Merge "Fix edit button in screenshot share activity" am: d7013fb9 am: c6158cc8 am: e50de70f am: f0f06ed2 am: be6564a7 am: 6e53f116

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



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