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

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

Change-Id: Icec593eb6bd96e83955c12b36068b179aaf9a2b7