Merge "TIF: fix 'divide by zero' exception in BundledTvInputServiceTest" into marshmallow-cts-dev
am: 691f611c0d

Change-Id: I2728f0700b489219821095dba4a0419a103a0c0e