[automerger skipped] Merge "Move default sounds to /product" am: 6feab6bf6c am: d60c748952
am:b0affe2100-s ours am skip reason: change_id I3bfc71b46eb64b4d4614b62c65fb8821bf1c271a with SHA1b8f6d0d5bfis in history Change-Id: I86a46f0d8dee265f726c3d28db0d27b307865251
This commit is contained in: