Merge "Merge "Logging improvements for time zone updates" am: 2cae07284d am: 42199bf5a0 am: 80aaf8fa37 am: 26827d8fb3" into oc-mr1-dev-plus-aosp
am: dd63f49d0f

Change-Id: Ie8547a3180668d6e1f10701ae58fcf597a1b2e5a