[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound." am: bbe8990162 -s ours am: 9bc17a66e6
am: 72e042db9d -s ours
Change-Id: Iaedfd0ee40d32f7b040ae0e9871a8f3d8aab552d
This commit is contained in: