Merge "Fix race condition btwn row and shelf icon init" into rvc-dev am:...

Merge "Fix race condition btwn row and shelf icon init" into rvc-dev am: c9ca670c am: 62dd30fa am: 41267edf am: 03262f25

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

Change-Id: I0b7c4e002b6437cc0b640c8c70905bb5016d1040