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