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