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

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



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