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 am: 61948eb39d
am: 5a0398674f

Change-Id: I1079761cbb9eb7df8a6a9d6f32ac2479450f7b4f