[automerger skipped] Merge "Add bootclasspath_fragment." am: 9b050aa5 am:...

[automerger skipped] Merge "Add bootclasspath_fragment." am: 9b050aa5 am: 87ca2065 -s ours am: 6fd23149 -s ours

am skip reason: Merged-In I1537d8a30c67995955af2d2d1bb2c11f01a24fe9 with SHA-1 26a0e1a6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1705472

Change-Id: I981fbedbad8d6cefcaa0ea34162c4ea24546385c