Merge "Merge "Simplify APIs exposed for time zone lookups" am: 19de70814a am: fbf9b6c05a am: 80bd973c3b am: 4082aa586b" into qt-qpr1-dev-plus-aosp