Merge "Merge "Fix duplicate bubbles in overflow" into rvc-dev am: 8a9020bb am: 81ba4275" into rvc-d1-dev-plus-aosp am: 63cf84d9

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

Change-Id: I16cd44ad286e46d32c820b1a82ae8bd26b344a86