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

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

Change-Id: Iabfe12f53a9f10a00b5f2b388587472449d22780