Merge "Create full API surface java_library in combined_apis" am: 2eab0410...

Merge "Create full API surface java_library in combined_apis" am: 2eab0410 am: b1ee6481 am: edb881d5

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



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