[automerger skipped] Merge "Add bootclasspath_fragment." am: d9de9d783b am: be47f3b7d1 -s ours

am skip reason: Merged-In Ia19ed0d5e13676882239dd5a1456c97549119994 with SHA-1 8bb425a75e is already in history

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

Change-Id: I9c4ba13c39c7e36bbf933ad24e792a9a47cab524