Set resource id correctly when resolve fails am: e7ab62723a am: 9e78098e85

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25318a316ae24d3f587009c688f7e830b7c00c2b