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

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

Change-Id: I2e19424ea55b4a41ccfddd0c4d4644f789c21785