Merge "Add parameter for sideloaded caption formats" into rvc-dev am: a99dba8b am: 4d21c064 am: ee3c9da3

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

Change-Id: Ice760f2a4a27f3f3d8678920b9897b539325d136