Merge "Merge "DO NOT MERGE: Add AudioSecurityTest" into lollipop-mr1-cts-dev am: 6681cd03cd  -s ours" into marshmallow-cts-dev am: 0108b63ba2  -s ours am: 8aab25e649
am: 37c8e5285f

Change-Id: I49e3aa625dee4a1e30dde9c3afa6bcf957171901