Merge "Convert frameworks/opt/timezonepicker to Android.bp"