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

Change-Id: I24b36c19ae97f411cd20110d484dd581e4d0c91e