Merge "Change image attachment test to use a public resource ID" into tm-qpr-dev am: 7fc1f0cb

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



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