Merge "[automerger skipped] Merge "StreamingMediaPlayerTest: make HLS tests local" into nougat-cts-dev am: c59177cf6a -s ours
am: 5d020b31c8 -s ours
am skip reason: change_id I164c0a64287bafd4b97209832d6015a22d4ef59e with SHA1 589fe4ff98 is in history

Change-Id: I1e2f198fcabfa58d3c60124acb9d3c7792db3e73