Merge "Fix PeopleSpace when showing only priority or recent conversations...

Merge "Fix PeopleSpace when showing only priority or recent conversations (1/2)" into tm-qpr-dev am: d5a4b9e5

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



Change-Id: Ide1a98ecada9661c9e4bb25b5a54840be89d3f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>