[automerger skipped] Dedup smart reply updates for bubble flyout [DO NOT MERGE] am: 0ee7184551
am: b1bfd957ac -s ours
am skip reason: subject contains skip directive

Change-Id: I894d249084d41cc1305e4dec4497b88b504b1ca0