Merge "Fix race condition btwn row and shelf icon init" into rvc-dev am: c9ca670cf2 am: 4ccc5840fa am: 2be4b16140
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11959993 Change-Id: Ieb2ca8452a03b50706af8a3556813fc68e64e3ec
This commit is contained in: