tree b37082d0049dcdb91f0feec17cf9ec25002e7b93
parent db3a291e9daef78a03d71079d79673c1291630df
parent 9bc17a66e63b35bcc4e1fbda79c8ee7c54942a30
author Tyler Gunn <tgunn@google.com> 1531866409 -0700
committer android-build-merger <android-build-merger@google.com> 1531866409 -0700

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

Change-Id: I3bd5ec5a2867f02f02fdbb906bc2323e8724c6e6