Merge "Convert frameworks/opt/timezonepicker to Android.bp" am: 0202810bac am: bec1b4c6b5
am: 8c945c27ff

Change-Id: Ia9e3e864d45ace9d50d99967de801959d022efee