Merge "Prevent conversations with bots from being in the people section." into...

Merge "Prevent conversations with bots from being in the people section." into sc-dev am: 6a895fce

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

Change-Id: Ibd4ea6956981a934c792b02777ba78946d5f8373