[automerger skipped] Merge "Update sound/vibrate notification key only when it actually buzz/beep." am: 5432355d0c am: 21d607da99
am: 065103f24b -s ours
am skip reason: change_id I208797f370ac5a30db5fcc316be956335a418319 with SHA1 55102a8ebd is in history

Change-Id: I86f14f31b3f9a165eb682231e1172775b8dda86f