Merge "Clean up bubble text view test so that the feature flag is off at the end" into tm-qpr-dev am: c5677f824f am: 888291b866

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

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