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

Change-Id: Ie4c1d91961c2588585751f234d9a390c66c6038c