[automerger skipped] Merge "Workaround to make AlwaysUsePrebuiltSdks() work...

[automerger skipped] Merge "Workaround to make AlwaysUsePrebuiltSdks() work with platform_bootclasspath" am: 40aa4363 am: 773f71eb -s ours

am skip reason: Merged-In I3226e21cd6a7f9e4d6bbe94e54129ac5e1d4c679 with SHA-1 59db6d4c is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1711988

Change-Id: Id2deda3ec8335d637fc96bffad34000d53fa6c76