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

Change-Id: I3bd5ec5a2867f02f02fdbb906bc2323e8724c6e6