Merge "Add parameter for sideloaded caption formats" into rvc-dev am: a99dba8be0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11971039

Change-Id: I00f3ef52f98fd3fdc26c76fb7a9a4ff13070a969