Merge "Add config to disable Bubbles" into tm-dev am: d421a513 am: 1af3c20c

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



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