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: 29deaea2 am: 1bfe814a am: 528bc16e

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

Change-Id: I5fd18875530e24576892c09d90b9d287687105d4