Merge "Stop using `group_static_libs` property" am: bc8a6d063b am: e29dc9dfe1

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

Change-Id: I5461a8ba08b3a88ea01a68a1dab4df87e7dab90d