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

Change-Id: I112950aa84d545c71b2672237e4f68ec4c8edfe4