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

Change-Id: Ifc7988fe9bf93ce9dd3197ce6f841e133abbada4