Merge "Merge "Fix race condition btwn row and shelf icon init" into rvc-dev am: c9ca670c am: 62dd30fa am: 241a60e4" into rvc-qpr-dev-plus-aosp am: 5d2ee704

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

Change-Id: I0d1c334aecfcb603a974b83b6122218384179ae7