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

Change-Id: I7dd9a054f1046ac1e2c21cebb8b69dc04ea452bb