Merge "Remove don't bubble option for app bubbles" into udc-dev am: c7dfc839 am: 8669f6c9

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



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