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

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

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