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: I5c507c29d7319dbbb44a6cfe7775493b171c248f