Merge "Merge "Switch to use tz data module tz files, not runtime module" am: 1c5515c76a am: dfaa438238" into qt-dev-plus-aosp am: 0b81bdb1b0
am: b1d03b902d

Change-Id: If3c859b47d0b0d196b0d09a14211be57a1a8f350