[automerger skipped] Merge "Add bootclasspath_fragments to platform-bootclasspath." am: 9ad2395b4a am: 38eb9dfb86 -s ours
am skip reason: Merged-In I72c76685d337c683b79ccd38c8f3b91816e34102 with SHA-1 f14149e81a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705355
Change-Id: Id2b830541b828463aa3857f92741f5240ee29e13
This commit is contained in: