Revert "drop aosp Calendar"

This reverts commit 93132c96800faee464c1f96732bd7789019c75bd.