[automerger skipped] Merge "Merge "Simplify APIs exposed for time zone lookups" am: 19de70814a am: fbf9b6c05a am: 80bd973c3b am: 4082aa586b" into qt-qpr1-dev-plus-aosp
am: 3185644055 -s ours
am skip reason: change_id Ib615976fae76ceb98873a33e1e995542e691c9d0 with SHA1 babab5cd6a is in history

Change-Id: I1514ebdf61a24eacf7199fda6b50014b09a7d980