[automerger skipped] Merge "Add bootclasspath_fragments to...

[automerger skipped] Merge "Add bootclasspath_fragments to platform-bootclasspath." am: 9ad2395b am: 38eb9dfb -s ours am: 20a045ca -s ours

am skip reason: Merged-In I72c76685d337c683b79ccd38c8f3b91816e34102 with SHA-1 f14149e8 is already in history

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

Change-Id: I001883182ae01f4c2802f25a80dc30b222107c0a