Merge "Adding an id to the resolve grid item" into tm-qpr-dev am: 66662cc2

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



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