Merge "AOSP/Calendar - Android.bp changes" am: 3de82c5a9d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1765265

Change-Id: I86b4c29622800c914c93cb41d9595647f01d267f