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

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



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