Merge "Merge "Merge "PlayVideoActivity: update comments for ENABLE_PASS_DELAY" into lollipop-mr1-cts-dev am: 7ecee98066" into marshmallow-cts-dev am: 798ea4874f" into nougat-cts-dev am: 294f6ad085
am: ef6d8183ea

Change-Id: I4e8a8959c1ca1df73d09a14324114e442e46fcd8