Merge "Add bootclasspath_fragment." am: 27b3662fc3

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

Change-Id: I593205dffae11b3ae84d6721e932a42ed6b76fea