Merge \\"audio policy: workaround for truncated touch sounds\\" into nyc-mr1-dev am: 0493cca1ba
am: afaf9cd17b

Change-Id: Ie88e2b2fa5150d6768ec41c1d872e3d417b1c2e4