Merge "DO NOT MERGE: Add test to ensure media stack has no sticky SSLv3 fallback DO NOT MERGE am: 00c543d5f6  -s ours" into lollipop-cts-dev
am: 42f434ad1e  -s ours

Change-Id: Ib01ce53c5f5b1cb409c52f3d0f141eb416a8db04