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

Change-Id: Ic31add0052a380fa1ae73fce4677d9cff0ca5228