Merge "Move java_api_contributions closer to their source" am: 39536eba am: 881e2ef7 am: e2766148 am: cb1d9ae9 am: 4973fd89

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



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