[automerger skipped] Merge "Dedup smart reply updates for bubble flyout [DO NOT MERGE]" into qt-qpr1-dev am: 51a159329f
am: b7fb13500a -s ours
am skip reason: subject contains skip directive

Change-Id: I8daa1749ebda483dcc19f8773c14dc8d8d1df939