Merge "Don't include app bubbles in the overflow" into tm-qpr-dev am: b08914d4 am: d59d52d9

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



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