Merge "Link CalendarAstronomer statically in the system server" am: b07c8fb2ac am: 0a6a977dfe am: a153245a75 am: 5c287bfd37

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374276

Change-Id: I2c14ab6c12629d1fb00868ff86fcd460e7811257