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

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

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