Merge "Add module lib and test union java_api_library module" into main am: d135292fb3

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

Change-Id: I2e987f35dcbd190db7171a9ba6e5cace06a08607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>