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: 27c45e4f

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

Change-Id: I4b215f1c0613f9f2b78bb20dcd4c626683cc6c09