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

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



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