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

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

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