Merge "Convert frameworks/opt/calendar to Android.bp" am: 8cc927f20f am: 2e046db8d3
am: c626121cf0

Change-Id: I5b8556d437d2c4b897b1e00769aa2c90c0d3986a