[automerger skipped] Merge "Dismiss Dialog in post instead of immediately" am: 9b2c026f10 am: 919e151bd3
am: b185c37a36  -s ours

Change-Id: I6a211571a7c2a4ffc740b2c01c27d5dd2a952440