Merge "PlayVideoActivity: update comments for ENABLE_PASS_DELAY" into lollipop-mr1-cts-dev am: 7ecee98066 am: d4a32d776c am: 609c308dac am: 443028d03f am: a11b2d7f7c am: 1bf8c66e00 am: 614907e40a am: ab7d44c7f3
am: 6044d76ade

Change-Id: Ic43cf8d4f275e565d3144b7f5bf9cdf13aee07b3