Merge "Add bootclasspath_fragment." am: d9de9d783b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705545

Change-Id: I88a6bed52cf6ca7ebd3419742af7524e935e635d