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 am: bac94e39 am: 4810cdb9 am: d721e317

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

Change-Id: I7b85e60ff7104a694f5576dd9f9c2bc3b8719c97