[automerger skipped] Merge "Add bootclasspath_fragment." am: 27b3662fc3 am: 70bb5cb9cc am: 4c0cad95c2 -s ours

am skip reason: Merged-In Ic80a004135d2747472f98d6c7e666c4acb14badf with SHA-1 de9636a50f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1705377

Change-Id: I1425cf69f68cf49f48aa777e7d6df35004e80942