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

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

Change-Id: Id4fce6757d3927376882bf40efd920f16a9b3f19