[automerger skipped] Merge "Merge "Simplify APIs exposed for time zone...

[automerger skipped] Merge "Merge "Simplify APIs exposed for time zone lookups" am: 19de7081 am: fbf9b6c0 am: 80bd973c am: 4082aa58" into qt-qpr1-dev-plus-aosp
am: 31856440 -s ours
am skip reason: change_id Ib615976fae76ceb98873a33e1e995542e691c9d0 with SHA1 babab5cd is in history

Change-Id: I1514ebdf61a24eacf7199fda6b50014b09a7d980