Merge "Clear content from tile when conversation opened in bubble" into sc-dev am: 4c91e055 am: 2d826c9b

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

Change-Id: If6400d22b1a0abfbd8765f11ee1f92acd313e674