Merge "audio: fix switch to break or use FALLTHROUGH_INTENDED" am: 599f3305dc
am: 6e97e80782

Change-Id: Iabe50e2862e3b667763b6d868764465c915fb818