Merge "Merge "Fix duplicate bubbles in overflow" into rvc-dev am: 8a9020bb am: 79006c58 am: 5d9027e9" into rvc-qpr-dev-plus-aosp am: 46a9aec7

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

Change-Id: Id50cc3d82f1a83c8234381fd23eac323b0b05595