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

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

Change-Id: I1c53ba090973c6c52f945da83dccaced247fa24f