Merge "Merge "DO NOT MERGE: Add AudioSecurityTest" into marshmallow-cts-dev am: 8d8f1380c1  -s ours" into nougat-cts-dev
am: 11f5d15a40  -s ours

Change-Id: I92ab831ba9aab13cafba57b6bc47f5c8f50f8821