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

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

Change-Id: I6bfed6217ed6b765a16fc58df4e5fdc2d555be6e