Merge "Show 2nd row if we have 1 row in active profile and empty state in...

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

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

Change-Id: I9c0ffb65a2f4a1ae966647d4b00618323d382643