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

Change-Id: I7472e8dac6f3c8098ec8c6ef9cf6e98b76efeb42