[automerger skipped] DO NOT MERGE Update setting to be bubbles not badging am: 8527dcb20b
am: 24011d4324 -s ours
am skip reason: subject contains skip directive
Change-Id: I7b03ab8f419e878e421017a84012bdb54ae454cd
This commit is contained in: