Merge "Track move of tzdata: bionic to system/timezone"
am: 867ff783d3

Change-Id: Iaf6a32b6cddd15d402bfe6e499f15abe401ea78b