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: I6ac2d894648067892ae229e3a369da68fa3d47be