Merge "java_api_contribution public, module lib module definition for...

Merge "java_api_contribution public, module lib  module definition for framework base" am: a7916faa am: abc2e450 am: 0dab4e47

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



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