Merge "Move java_api_contributions closer to their source" am: 39536ebaaf am: 881e2ef7d9 am: e276614875

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

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