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

[automerger skipped] Merge "Persist remote input image attachment across layouts" into sc-dev am: 931584a9 am: a606bffe -s ours am: 4d0ba1d9 -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: I79d8b2ecc20b62c3ae231f0446e6a0d80a19ebf9