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

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

Change-Id: Ib9cec75d6e666a1dfc6c2bf3cd6e479a2ab7cd9e