Merge "Make bootclasspath srcjar available to make" into main am: 53565bfdb0 am: 5fc30c4de8

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

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