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

Change-Id: I08459ef2df89e1367c88c764bcc3fd09be095625