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

Change-Id: I404d8c88741348b705419b836a6a206e0d7e2310