Merge "Fixes sound panel create multiple SoundSettings activity"
am: e45a8aadd4

Change-Id: I20e5dd44471df7a25bd50e0bafdf040cf9b04134