Merge "Export javac classes" into main am: aaee6ced74 am: 3fbd3eb1c9

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

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