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

Change-Id: I4264c275e703ae2d98871150082fc2f8f4fb2a59