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

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

Change-Id: Ib0a440a90717ca12a79d24c30ec84df6eb9e8df1