Merge "PlayVideoActivity: update comments for ENABLE_PASS_DELAY am: 0b8bed432c am: 615c5fb8bd" into nougat-cts-dev