[automerger skipped] Merge "Merge "Persist remote input image attachment...

[automerger skipped] Merge "Merge "Persist remote input image attachment across layouts" into sc-dev am: 931584a9 am: 7f4daba8" into sc-v2-dev-plus-aosp am: f6d60372 -s ours

am skip reason: Merged-In I85f7726c4b8c1bfcf64a1ff3f4be092e970747ae with SHA-1 4f02a9c1 is already in history

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

Change-Id: I6b8405dd0382eb34cbff7e04d3f928a7866ff23b