Merge "Merge "Simplify APIs exposed for time zone lookups" am: 19de7081 am: fbf9b6c0 am: 80bd973c am: 4082aa58" into qt-qpr1-dev-plus-aosp