Merge "Show 2nd row if we have 1 row in active profile and empty state in other" into rvc-dev am: d1fee565 am: 29deaea2

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

Change-Id: Id2bb4794550ea3e82401839e8b34a31fe6a1a7b8