Merge "Convert java_library_static to java_library" am: 0f6542d422

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

Change-Id: I9f7ac868de9b259a1162597e819e7b1b900298bb