Merge "Merge "PlayVideoActivity: update comments for ENABLE_PASS_DELAY" into lollipop-mr1-cts-dev am: 7ecee98066" into marshmallow-cts-dev am: 798ea4874f am: adc44bc5ad am: b0c9777b49 am: d9713140bf am: b0e5305383
am: 720abf35d1

Change-Id: I059ba80684f47940c2be9560451e7554f63c5a80