[automerger skipped] Set resource id correctly when resolve fails am: e7ab6272 am: 9e78098e am: ccd5ca9b -s ours

am skip reason: Change-Id Iad1760c0e246da1a4bf64d1c2ec60bb08da32d06 with SHA-1 43d2f21d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02c14357286dd07440a2e8451987df99df6f82cb