[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
am: bbe8990162  -s ours

Change-Id: Ic8cd7c12d58d9f75b1d952a7e9fca6cbe3f8fb33