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

Merge "Add parameter for sideloaded caption formats" into rvc-dev am: a99dba8b am: 4570870c am: 6e0bb4a5 am: 4c250882

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

Change-Id: I1ce1518cd14a23e4210444f19cce54831d0be99c