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

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

Change-Id: I49e86b3372f5d3d628502a55dc2d39316fc062ae