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

Merge "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: 27c45e4f" into rvc-qpr-dev-plus-aosp am: 4a247fe8

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

Change-Id: I690df57842c6c382bc412795404a43d8e160d3c6