Merge "Fix missing notifs after restoring Overflow Bubbles" into tm-qpr-dev am: 87f4c66c0a am: 7da4892606

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

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