Merge "Convert java_library_static to java_library" am: 0f6542d422 am: 6b26dfae04 am: 76dbe0d124

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

Change-Id: I381ce7489c4747a3f26d2821b2b1acdb2dab3195