Merge "Convert the Android.mk of CalendarTests to Android.bp" into main