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

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

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