Merge "Add bootclasspath_fragment." am: 27b3662fc3 am: 70bb5cb9cc

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

Change-Id: Ia36b1c15e76ff449d1208c12d907102f46a713c5