Merge "Audio assets: add NFC sounds" am: 5cb7cd68a0
am: 8df8455384

Change-Id: I11d6eba4ca5e888e71e91fdef2d7dd8383391ec8