Merge "More robust fix to BubbleTextViews appearing on multiple rows." into tm-qpr-dev am: a57bff8473 am: f4abbadb21

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20105877

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